Bug 144371

Sun Jul 11 01:12:50 2004  Soeren Sandmann  <sandmann@daimi.au.dk>

	Bug 144371

	* gtk/gtknotebook.c (gtk_notebook_size_allocate): Remove an
	unnecessary redraw..

	* gtk/gtknotebook.c (gtk_notebook_page_allocate): Remove some
	incorrect redraws.

diff --git a/ChangeLog b/ChangeLog
index 1d0cab15b6b6a7d26c0180f70384232f8a4b50fa..5ba3c8676f613ef423d7afe0d62fee86c64aae67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sun Jul 11 01:12:50 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       Bug 144371
+       
+       * gtk/gtknotebook.c (gtk_notebook_size_allocate): Remove an
+       unnecessary redraw..
+
+       * gtk/gtknotebook.c (gtk_notebook_page_allocate): Remove some
+       incorrect redraws.
+
 Sat Jul 10 01:33:25 2004  Matthias Clasen  <maclas@gmx.de>
 
        * docs/RELEASE-HOWTO: Updates.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1d0cab15b6b6a7d26c0180f70384232f8a4b50fa..5ba3c8676f613ef423d7afe0d62fee86c64aae67 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+Sun Jul 11 01:12:50 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       Bug 144371
+       
+       * gtk/gtknotebook.c (gtk_notebook_size_allocate): Remove an
+       unnecessary redraw..
+
+       * gtk/gtknotebook.c (gtk_notebook_page_allocate): Remove some
+       incorrect redraws.
+
 Sat Jul 10 01:33:25 2004  Matthias Clasen  <maclas@gmx.de>
 
        * docs/RELEASE-HOWTO: Updates.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1d0cab15b6b6a7d26c0180f70384232f8a4b50fa..5ba3c8676f613ef423d7afe0d62fee86c64aae67 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+Sun Jul 11 01:12:50 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       Bug 144371
+       
+       * gtk/gtknotebook.c (gtk_notebook_size_allocate): Remove an
+       unnecessary redraw..
+
+       * gtk/gtknotebook.c (gtk_notebook_page_allocate): Remove some
+       incorrect redraws.
+
 Sat Jul 10 01:33:25 2004  Matthias Clasen  <maclas@gmx.de>
 
        * docs/RELEASE-HOWTO: Updates.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1d0cab15b6b6a7d26c0180f70384232f8a4b50fa..5ba3c8676f613ef423d7afe0d62fee86c64aae67 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+Sun Jul 11 01:12:50 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       Bug 144371
+       
+       * gtk/gtknotebook.c (gtk_notebook_size_allocate): Remove an
+       unnecessary redraw..
+
+       * gtk/gtknotebook.c (gtk_notebook_page_allocate): Remove some
+       incorrect redraws.
+
 Sat Jul 10 01:33:25 2004  Matthias Clasen  <maclas@gmx.de>
 
        * docs/RELEASE-HOWTO: Updates.

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index e44f56e8c4a07d81c5f3ef64207b028f3e4768e6..751c0ae0b305f28b1f055f47f7448d1ec06e13b3 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -1513,13 +1513,6 @@ gtk_notebook_size_allocate (GtkWidget     *widget,
 
       gtk_notebook_pages_allocate (notebook);
     }
-
-  if ((vis_pages != 0) != notebook->have_visible_child)
-    {
-      notebook->have_visible_child = (vis_pages != 0);
-      if (notebook->show_tabs)
-       gtk_widget_queue_draw (widget);
-    }
 }
 
 static gint
@@ -3588,51 +3581,6 @@ gtk_notebook_page_allocate (GtkNotebook     *notebook,
   xthickness = widget->style->xthickness;
   ythickness = widget->style->ythickness;
 
-  /* If the size of the notebook tabs change, we need to queue
-   * a redraw on the tab area
-   */
-  if ((allocation->width != page->allocation.width) ||
-      (allocation->height != page->allocation.height))
-    {
-      gint x, y, width, height, border_width;
-
-      border_width = GTK_CONTAINER (notebook)->border_width;
-
-      switch (tab_pos)
-       {
-       case GTK_POS_TOP:
-         width = widget->allocation.width;
-         height = MAX (page->allocation.height, allocation->height) + ythickness;
-         x = 0;                              
-         y = border_width;
-         break;
-
-       case GTK_POS_BOTTOM:
-         width = widget->allocation.width + xthickness;
-         height = MAX (page->allocation.height, allocation->height) + ythickness;
-         x = 0;                              
-         y = widget->allocation.height - height - border_width;
-         break;
-
-       case GTK_POS_LEFT:
-         width = MAX (page->allocation.width, allocation->width) + xthickness;
-         height = widget->allocation.height;
-         x = border_width;
-         y = 0;
-         break;
-
-       case GTK_POS_RIGHT:
-       default:                /* quiet gcc */
-         width = MAX (page->allocation.width, allocation->width) + xthickness;
-         height = widget->allocation.height;
-         x = widget->allocation.width - width - border_width;
-         y = 0;
-         break;
-       }
-
-      gtk_widget_queue_draw_area (widget, x, y, width, height);
-    }
-
   page->allocation = *allocation;
   gtk_widget_get_child_requisition (page->tab_label, &tab_requisition);